*: comments along with minor cleanup