Fixes #33 – Clearer focus