Use yardoc for new methods

Also substitute '&&' for 'and', and fix some whitespace