tidy up & polish