Code cleanup: Split object rendering into it's own file