Improve exercise two slightly