pep8 fixes, removed haml requirement