Whenever the Fire Marshal finds that the means of egress from a building or portion thereof, or that the means of preventing the origin or spread of fire or of extinguishing fire in any building or portion thereof, are insufficient or inadequate, the Fire Marshal may direct and require that any such building or portion thereof be rearranged, altered, or repaired to be sufficient and adequate in such respects.