Cleanup
Fix render reset by handling state outside

Local component state depending on input arguments is a sign that the
state should be handled by the calling environment.