10 Commits (refactoring)