Comments, remove duplication