make code almost pep8 compliant

ignore E501, E221 and E226 for now :)