Reformat code project wide and add a solution for problem 36