Reorder variables and remove side-comments