Changed some variables and line lengths to make it more PEP-8 compliant