Cleanup code, slightly.