2014/08/23 code comments fix-3

- review comments fix