refactor-3