clean up comments & remove extraneous methods + Enumerable mixin not needed