Cleanup, license and keywords