Changed to PEP-8 variable/method naming conventions