organize imports, fix xml error