some light refactoring for deprecation & de-linting