Update keywords
Refactor unused variables