Some simple code cleanup

Clears up some whitespace and unneeded code.
Merge pull request #1 from richardadjogah/code-cleanup

Some simple code cleanup