cleaning, refactoring, adding missing classes, attr, ..