code clean up
span is udpated