tweaks and cleanups to the workspace implementation

@keertip, this is mostly style and whitespace changes to the workspace implementation.