Code refactoring

Moved all of the Paints to separate fields. This way they can be reused.