Doc improvements suggested by Scrutinizer