Comment clean up (TODO cleanup) and removed tailing comma!