Allow keyword @ to be indented
Clean up redirect