little bit of code cleaning