update dependencies
code cleanup