Performed additional code cleaning.