Tighten condition
Fix comments