added comments, removed unnecessary DIs, prepared for major data object restructuring