vanity refactoring for more clarity