Clean-up with input from Sri