pep8 fixes and private members added