Made all classes & cleaned code a bit