Updating dependency requirements, cleaning up some code
mucking about
fixed paren usage
some code cleanup