Refactor from a class with one public class method to a singleton instance