Code (syntaxe) improvements