Reformat code to 4 spaces + 120 wide lines,  address more static analysi...

...s warnings

Attempted to move to a more modern code layout of 4 character indents and 120 character lines.  This means that you see a lot less code wrapping and is 'more standard'.  Also worked to use more camelCase names.