Use explicit return type var names instead of guessing