minor code beauty changes