Cleaning up few things