Code cleanup, extracting assign default values task