improved sandwich formatting