Code review (format) from Ronan