General restructuration of code and coloured messages