* chore:fix minor issues reported by code-climate * chore: reduce code duplication * chore: update vendorSHA for nix build due to recent updates to dependencies