Cleaned up focus finder code base.