Fix heading, remove comments