code clean up, a few changes to modifier class names