again some code cleaning