remove redundancy and cleanup comments