FIX problems with pep8 style