Some code cleanup
Some code cleanup

HackLinux/pyes,jayzeng/pyes,HackLinux/pyes,mavarick/pyes,mavarick/pyes,haiwen/pyes,Fiedzia/pyes,mavarick/pyes,jayzeng/pyes,haiwen/pyes,aparo/pyes,aparo/pyes,Fiedzia/pyes,jayzeng/pyes,aparo/pyes,Fiedzia/pyes,haiwen/pyes,HackLinux/pyes