2014/08/23 code comments fix

- review comments fix