Proposed code format for improved readability/cleaner look.

This is a proposed idea of how to format the code so it looks much cleaner and somewhat easier to read. Feel free to close this pull req if you do not like it. Look at the full files for a good idea of it, the diffs do not do it much justice.