removed unnecessary braces, inlined return