Refactor

1. Simplified the code by refactoring long functions.
2. Reduced redundant logic (e.g., handling RenderOnDemand once)
3. Improved code readability with helper functions.
4. Enhanced debugging by making error logging more specific.