Add greedy focus; Cleanups