add keywords / update dependencies
code refactoring