Cleanup based on catkin_lint checks