factorisation in beforeach
removing commented test
little refactoring
factorisation in beforeach
factorisation in beforeach
little refactoring
directoty renaming