Formatting, render code decoupling, bug fixes, etc.