cleaned up format and var names as requested by @CovertJaguar at #872