simple timeout setter
code cleaning...
simplifications