Minor cleanup;