some code cleaning
some more code cleaning