Fixed show
refactor comments