Minor cleanup of previous commit