Refactored straight