Code cleanup and return to dOxygen style comments