Fix the lint and Doxygen issues