Doxygen frindly comments. Minor simplications.