Refactored object and fixed rendering.