Fixed folding and added doxygen comment handling