Add autofocus , fix formatting