minor changes in class structure