Code Cleanup, Improved Rendering, Refactoring