code-style
deprecation resolved