Comments updated to suit doxygen