Minor change
Do some clean up