cleanup according to PEP-8
further cleanup