Fixed: classes added more than once and dont get removed
Reformated source