CS Fixes

CS fixes to comply with the other league repos.
I like adding extra line returns when there is complicated logic like this. I'm not necessarily opposed to this change, I just worry about legibility.