impl: integrated latest style changes