Nitpicker changes