code cleanup
cleanup
more simplification
merged