Reformat code to 4 spaces + 120 wide lines,  address more static analysis warnings
Merge pull request #5 from rorygraves/master

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