Clean up public and private methods so it's consistent

[ehne]

Currently there is a mix of single and double underscores used for private methods. To actually get the proper python private methods these should all be double underscore.