refactor lagi

guder