Autofocus readability

Move some stuff around and deleted extraneous code