cleaning and such
Merge pull request #6 from fox-squirrels-2013/vanessa_wed_1040

cleaning and such