got rid of unnecessary code, added some renderers