Clean up code: deleted test code, added better var names