Cleaning code.
More cleanings.
Merge branch 'master' of https://github.com/fabriph/CERN-THE-Port-hackathon