User profile changes
CLean up some comments