Refactoring and Cleanup: DataView