Minor refactor
Merge branch 'master' of github.com:cern-hackdays/lmb