Use one-liners if we can get away with it

By get away with it I mean:

 - Line length not over 80 chars on avg
 - Single line statement