Small clean up, added a few comments