Make source more idiomatic