Refactoring

Update hata
Use hata() instead of $()