Refactoring, replace camel case with pep8 style variables and functions, covering at minimal public API portions