cleaning up and adding renderItems