Minor refactoring

Orientation is handled better now