tidy up based on feedback