Review comments implemented