Refactor ToolBart