Organize imports, minor cleanup