[REFACTORING] Cleanup of Rendering module, step 2