Fix bugs and clean up codebase

[saltykheera]

Resolved reported bugs, removed deprecated code, and improved overall code readability and maintainability for a cleaner final release.