code cleanup
tinkering