Formatting and comment tidying.