refactoring straight?