Cleaning up the systematic encoder and integrating the storage aware systematic phase