Small clean up to code