enable razor
refactor