2 Commits (fix/refactor)