Remove need for instantiation call and switch to class level/static method