Refactor straight