Fixed variable order

No more silly IntelliJ variable shifting