* Cleaned up a bit in ApiRender