simplify return defn; consistent lazy matching; whitespace