Formatting

The exception to the rule below that Eclipse files are dependent upon
installation, I've reformatted the code as I like it and added the
Eclipse conventions.