But if it's okay for you I'd leave it like that since we're going to refactor it anyway and I'm also very short on time