(refactor) removed comments