removed the temp variables i'd created for refactoring