Small clean up in the code.