code cleaning, remove warnings