Double-check comments, fix style