Little bit of work + formatting