add keywords
code cleaning