Comments added and clean up