Code improvements according to @tsauerwein suggestions
Code improvements according to @tsauerwein suggestions

c2corg/v6_ui,olaurendeau/v6_ui,olaurendeau/v6_ui,c2corg/v6_ui,Courgetteandratatouille/v6_ui,c2corg/v6_ui,olaurendeau/v6_ui,Courgetteandratatouille/v6_ui,Courgetteandratatouille/v6_ui,Courgetteandratatouille/v6_ui,c2corg/v6_ui,olaurendeau/v6_ui