Questionable rendering refactoring; Typo;