Starting to clean up package.