Align NN + NN propagate + code clean up