Tidying code before the "big changes"