Optimize the code

Signed-off-by: jssoscar
Version: 2.0
Date: 2014-1-13 11:49:03