Fixing up some code for quality metrics
Updating dependencies