started a bit of formating