refactor back to functions with verb names