Refactor: cleanup comments and unused imports.