2 Commits (refactoring)