Cleanup. Simplify focus toggle logic.