More workspace reformat