Tidying to pass lint checks