Improve ruby code on if/unless clauses

[tmaier]

"unless abc.nil?" is bad ruby; "if abc" is simpler and preferred Also use only_if and not_if where applicable