Basic clean up done - Ready for upload to CPAN at Version 1.71