Hyperspace cleanup and doxygen comments