Refactoring workspare - part 2