[samjsharpe] Tidy up config