Trivial cleanup.
Added back the focus handling (#3).