Removing dependency on Sugar.JS