debug, code tidy, comment
previous commit ineffective