Bunch of code cleaning in embodiment + improve/update comments