format + fix build