Some minor code cleanup and comment changes