Some cleanup

Some small cleanup.