For #18: Cleanup and ready for user testing.