Refactored:
Renamed some methods to better match language convention, and increase brevity,