reworked formatting