Minor cleanup of field names + field init in constructors.