Merge pull request #159 from Tilka/misc

Cleanup stuff
Remove lots of leading underscores