Formatt and clean up code, may not be perfect as i am still playing with eclipses settings