Fix to make it build + formatting