Reformtted and added smartcase