code cleanup
no effective change
code cleanup
code cleanup
code cleanup
attempting RLO, but not working yet