A small cleanup of the code.