Tydying some minor details