spanish change and cleanup