Review comments applied