Class code cleanup