Fix and prettify comments