Clean some code and improve show/hide comments