Nitpick: there are a few long lines in this file. Can we break these lines for readability?