Fix the narrow computation and style