refactor - follow up