That's very long lines, I can't see the end of the line on the PR without horizontal scroll - any way to break it up or, better, give slightly shorter names to make it easier to use?