2014/08/23 code comments fix-1

- review comments fix