Removes use of Object.defineProperty

Minor cleanup as well