remove unecessary focus: true
don't repeat similar code