Code cleanup and comment fixes.