Fix namespacing bug.
Prefer core fns to custom ones & minor style fixes.
Merge pull request #1 from ghoseb/master

Fix namespace bug & other fixes