Renamed variables for clarity. Added command to replace move up macro.