Tip: write the commit message before you write the code. It tells you what's in scope

Started doing this at work last month. If I can't describe the change in one line, the change is too big. It has caught me splitting PRs twice and stopped me 'quickly fixing' three unrelated things on one branch.