Refactored

Clean up for hand in