slight refactor for clarity
1.0.2