6 Commits (refactor)