Small cleanup and improve comments