Fixes for Doxygen + code formatting