introduced some classes
removed unused constant