Add drawRect(...) in Bitmap class
Clean up color drawing