adding notes for code review
added scope limiters in table model and a little refactoring