Dependency updates
Code cleanup