Nitpicker suggestions