Refactoring to remove value