core_model: small code style changes