Some cleanup and run eclipse formatter/cleanup/imports