Refactored Old Code and Fixed Bugs

Refactored existing code, removing deprecated items and integrating new features (or improving upon existing ones)