Fix overly long lines to fit Github 117 char limit