Cleaning up a touch.. getting rid of unwanted variables