Clean up version. Ready for Iteration 2