improve formatting further