Formatting clean-up using the default Eclipse settings, removal of some
comments, some minor refactoring.