Move brush operations out of map class