Did a little bit of cleanup on problems 47 and 55