Small clean up