Codecleanup in workspace module (methods etc.)