New ToContent instance + code cleaning