Fix some comments (c -> colour) and join unnecessary line splits.