Slight refactor, so that it's more readable