Just a clean up