Another unnecessary refactor. I hope last this time ...