Some code cleaning and refacto, nothing to see here.