little refactoring and chaned settings