cleanup and add factor get, set