Codesniff cleanup
one-character coding standards fix
Merge branch 'dstockto-talk_comments_model_cleanup'