20130717

code refactoring