refactored brush-system