- code cleanup - reformatting