Code tidy, restrict directive to SPAN

Maybe this is not such a hot idea? we might want to use this for DIVs
as well