minor refactoring after running Linter on the files