Simplify logic w/ named return values