Pep8 conformation. Cleared API a little bit