organize imports ,format again, and fix naming issues