Clean Up Code

I moved some lines around and added spacer lines.