Cleaned up addPaint()