Few clean up