More little cleanup