dakwak app refactored