Fix typos + cleaner enumerable methods