Added row/column enumerators
Removed unused code
Removed old code
Minimized interface requirements