Simplify var declarations and return vals