Added another refactoring option