#884 Small improvements to the style