redundancy fix and comments