PR comments and improvements