a little bit code cleaning 2