Committed beginner solution; cleanup