Added notes for refactoring later