Few clean up things