Better formatted package