Fix style and more types