A little variable re-organisation after writing docs.
A little variable re-organisation after writing docs.

allansson/Calamari,NoesisLabs/Calamari,NoesisLabs/Calamari,merbla/Calamari,merbla/Calamari,allansson/Calamari