formatting & old var removal