added comment with notes on future refactoring