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

Also shortened the line length  of some arrays
Merge pull request #1601 from ravage84/schema-shell

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