Minor refactoring and begin friendships controller