Made minor changes into my classes