2014/08/23 code comments fix-2

- review comments fix