Got rid of some crap and made the change Nihkil mentioned