Subtle refactoring for awareness reasons