20140611

code refactoring