Data manager comments and minor refactoring