[Zourik] Straighten up