* minor changes to order of class