After code cleanup