7.0 refactoring

parenthesis over \