Some editor cleanup (for the streak!)