Minor updates. Removed the forEachOwnProperty function.