updated for pep8 and bootstrap