Change Class to static