Golfing

I went golfing with my code. Shortened it up as much as I could.