use short-cuts to tidy up if/else/returns