Little clean up