refactored to be pythonic instead of camelcase
broke data.py trying to OOP it