more cleanup, use less, use lodash instead of underscore, jquery 2.0