Refactored and worked on RenderController