Simple cleanup of the wrapper package

Minor changes... apply if you want.