Some intial tidying