Small cleanup of code.