Fixed an issue with Workspace and ClosingStrategy.
Code tidyup.