Fix to apply Coding convention on services.