Cleaned up comments and unused imports