* Fix types
* Fix style