a little code cleaning