. code cleanup