Major cleanup :)