Some refactoring, mostly on ROS

Follow up of the feedback provided by Diego Escudero.