code reorganisation
Clang fix