all remarks were refactored