Optimize the code

Version: 2.4.2
Date: 2014-9-23 16:18:31

Signed-off-by: jssoscar