Cleaning up jet vairables in format.h