Organized imports, removed a redundant comment