V2: Review comments fix