12 Commits (refactor)