Fixed some complaints from lent, hopefully more pep 8 compliant than less