Improve commentary and cosmetics