add debug strings.
refactoring - rename
remove useless condition