non-functional refactor