widget comment & minor code cleanup