Cleanup and minor fix.