Reorder and syntax

More syntax shuffling