* Minor clean up of comments