I personally really like the one line if's in this situation (nothing you have to add, just a remark - I hated one line ifs/unless but slowly have fallen in love with them especially with guard clauses :-) )