clean up few things