formatting reworked