Refactor with helpers