Updated focus to remove extra code