stage 1 tidy up