factor workspace material together
remove unused vars
Merge pull request #53 from mk270/factor-workspaces

Factor workspaces