refactoring odd