DataManager - Comment Cleanup