Problem 32
Slight tidy up