-fixed all class methods to static