#JC-1986: Implemented comment hiding, added separator