9 Commits (refactoring)