righteous refactoring