style and standards improvements