code cleanup
some more changes