overall source code cleanup, default eclipse formatter