Added brush tool
Clean up tool definitions