code cleanup before merge