Ok, so we're good with the way the code is now, right? So I'll close this pull request, then?