minor code cleaning done