reorganizing
PEP8 cosmit fix