more friendly sender and remove some unnesessary stuff from generation