Tidied up on 20140311

Signed-off-by: huangdada <huangdada@huangdada-PC>