Cleaned up some code
Well.  I did a shit ton.