Improve keyword generator