Tidy up and a few messages for the future improvements