formatting and deleted old stuff