Removing dependency on underscore