Small cleanup
Solve 13, 14