clean up execute a little bit, start working on rendering