last batch of comments/cleanup