zhang369 & feng30 : code refactoring