Cleanup, and move to package.el