code formatting and clean up
(commit done thru eclipse EGit)