Unit: code cleanup