Made some internal adjustments with classes