Refactor - simplify