changes some definitions to use Symbol.map
applying Jason's aesthetics suggestion