Organize imports, general code cleanup