Entity view rendering logic extracted to separate method
Remove dead code and other turd polishing