wraps some long lines

feel free to undo or reformat any of these changes.  I'm especially interested to know if you think line 402 (in your version) is ok wrapped like I have it.  It's a really long ternary operator.  It would probably look better as a simple if statement, but ternaries are so much less code :+1: 

I started testing, but will have to finish it tomorrow