Small updates and code cleanup.