some coding stye cleanup
doc comments