Small update/cleanup. Revert if needed.