Refactor to remove static methods