Cleaning up client time vs render time