Eclipse formatter + clean up
Applied to code