Problem 4 Cleanup

Making everything more neat.