CLeaning the code according to the redesign.