code cleanup
code cleanup
code cleanup
code cleanup
fixed tests