additional code cleanup