Cleaned Up Generic Comments