Redundancy improvements & more comments