Better formatting for plug