Data object cleanup and comments.