Complete init/update/finish-refactoring