Minor cleanup of code.