Renamed some methods and parameters for clarity; removed debug code