Code cleaning

A bit of code cleaning and commenting after a successful test in the
rpi.