More changes to small classes post