I can move everything to a static method. But not sure if that would be any better...