clean code and update dependencies