Clean up and updated text