review comments

remove toShortString
minor other changes