Remove dependecy on underscore.js