minor fix
clean up code
more clean ups
remove duplicate code
move operator test
add comment