Reorder inispec to be more readable