Small formatting and fix up the duplicate entries