Refactor | Beverly | remove if/else if from move