Add comments and move ignorecase and smartcase