Add style and minor fixes

This whole if/else can be `friendship != []`