code refactoring
enhandement duty code removed.