Clean up and final fix

Comments added
Ready to submit