Some cleanup of this PR