Slight refactor
Revert "Slight refactor"

This reverts commit 2cfe3c169951f5cdf8db866d38d02e501d7d536b.
Revert "Revert "Slight refactor""

This reverts commit c8e436e3bbe0916b6e26d550ba31e2740804cdec.