Fixed whitespace and scoped user to friendship