decomposition
pep8 fixes