More ass copy code cleaning. Proper span classes & cleaned up helper procs.