Added comment about refactoring later