cosmetics - braces on separate lines.  Note that I believe that @opdenkamp prefers a single return where possible, and that would lead to fewer changes in the diff.  I presume the order of the list here isn't important?