God class fixes