Fix typos, simplify "unless/otherwise" construct