Part 1 of exercise complete and code is cleaned up.