Small refactor again, same reason