added more Pythonic naming conventions