Simplify a few return statements using some in line syntactic sugar