Preparing for future refactoring, I guess