2 Commits (refactor)