Pr/16 Improve formatting.