PR cleanup from comments