Add space
Remove uncessecary span