package: cleanup, add keywords