pep8 styles fixes for libraries
Refracting into new structure