Changed variables to objects of the classes
Removed unused pictures