classmap, refactoring, clean-up