Made class more minimalistic