Cleanup, comments & small fix