Restore tokens when the view is restored. Close #17.

Includes some lint cleanup.