User profile tidy up