Cleaned up preview snippet handling