8 Commits (refactoring)