Add better comment formatting options