some code cleaning done