Leaving comment for future refactoring