removed unused and formatting
more junk