Changes to the way workspaces are created
Minor refactoring