Changing type of class to static