Improve formatting again