Fix always reset on create
Tidy up