add classmap; refactoring; if ( ! expr) sniff