More removal of chatper references
Yet more removal of chatper references
Auto reformat optimisation