(check-)style related changes