First little refactorings
generated NOT added in wizard