Cleanup comments and example