Cleaned up code a little

Just split a few of the longer lines up into several