refactor-2