Cleaning things up for package with basic functionality.