Refactor-3