7 Commits (refactoring)