Format and cleanup

Done in github editor... Untested.
Merge pull request #1 from Joby890/patch-1

Format and cleanup