IMO this needs one extra whitespace before line 44; otherwise good to merge IMO