Drop some unnecessary {}.
Improve list handling function names and parameter names.