Refactor some more, clean up rendering