Changed formatting to give better overview