Fixed indentation and doxygen comments... For real this time.