Improved organization and naming of methods in system.py