Code cleanup
Move media references from the S2 command to the Line