cleanup
more cleanup
more cleanings before cpan submission