Fix doc strings to match conventions better