Minor cleanup, possible frame leak