refactoring: redundant removed + minors