about code cleanup