Removed use of object.keys