A little more commenting and cleanup