comments and example cleanup