Refactor - Fix typo + use mapc for side effects calls