Refactor Object rendering