Code cleanuo und refactoring (fix #4)