removed some comments, added a TODO for rendering efficiency