some refactoring
 deletet unnessary stuff