cleanup code. No functional changes
cleanup code. No functional changes