Shortened the if clause line length by doing it the @markstory style ;-) 

Also shortened the line length of some arrays