I'm scared about refactors like this in this PR even if they are more readable.