Removed underscore (_) dependency, cleanup

(I like where this plugin is going). Nice work.