(refactor) Minor