profile class, and some cleanup (profile-updates)
Merge branch 'profile-updates' into profile

* profile-updates:
  profile class, and some cleanup (profile-updates)