Minor cleanup, no functional changes