Improved the last commit a good bit (poor nomenclature, etc)