fill out and tidy up