Small improvements to the class file