Nitpick tidying