Misc tweaks

Just some minor tweaks. IMO `unless/else` kills too much braincells so let's do `if/else` instead. :)