Streamlined and clarified previous commit

Credits for previous commit (sorry!)