Introduce comments

move back, I think you use comments only on show action
you don't have to include them