Code changes/code cleaning.