refactoring straight