workspace configurable, small cleanup