Added PaintHandler
Organized variables