20130916 clean code.