minor code cleanup, comment changes