2014-01-13:clean the code