some fixes for classes and merged to classes style