Reformatting and Updating

Updated python files to match more PEP8 standards. Templates were
altered and updated.