just some code cleaning