code cleanup, no functional changes