2013-10-29. Tony Wang. Code refactor.