FMU-17 some refactoring and cleaning