Small cleanup in code.