cleaning up few codes