conformed to pep8 standards (created dict variables to pass to templates)