Minor changes, code cleanup.