Optimization of a few lines

More than fair enough code cleaning...