Refactor-1