cleaned internal structure of classes and implementation.