Tidying up before adding functionality.