HOPKINS: Refactor checkSmoothMove and makeSmoothMove