RAZ-3279: Option to swap original with a rendition
- Code cleanup and commenting