refactoring
adaptation to Linux