Added if statement and Boolean variables
Changed some constructors to reduce code size