Splitting move up into smaller functions