tidy up and move some stuff around