Yeah, we need some refactoring all over. There's no reason to worry about it for this pull request.