Code clean up 5
Code clean up 5

shzy2012/jit,pingjiang/jit,shelsonjava/jit,tim777z/jit,printedheart/jit,tim777z/jit,shzy2012/jit,philogb/jit,tim777z/jit,printedheart/jit,mcanthony/jit,printedheart/jit,shelsonjava/jit,pingjiang/jit,mcanthony/jit,shelsonjava/jit,pingjiang/jit,philogb/jit,shzy2012/jit,mcanthony/jit