Removed unused imports, added comments