4 Commits (refactor)