Problem 60, 61
Minor refactor on some problems