Some cleanup. Removed package dependency for Data::Dumper