Tidy up change and add comment