add more keywords, remove duplicate declarations