Improve formatting - second try