Add renderer stubs and clean up code