commenting cleanup
coding style and commenting cleanup