tidy up move helper functions