Working on cleaning up renderer