Fixed build by applying pep8 and pep257 changes