Cleaned up the package definition.