Some light updates (refacto, typo)