code cleanup
code and coding style cleanup