Adding refactor