Made ICDocs code neater across the whole plugin, instead of just in
places.