Continue with tidying code