Bunch of cleanup for BuddySocial

Is there a reason this file breaks naming convention?