incorporating recovered changes
cleaning