Tidied up Razor changes.