Cleaned up filenames and various code
Solved Problem 32