Clean up comments and unused code
Refactor