Cleanup

Additional code cleanup.