Break up multiple blocks on single line

As @fatbusinessman pointed out some of this logic was hard to read.