Doing some more style updating (capitalization of exception classes; using _ is enough for private members - __ is used in Python specific methods)