Formatting changes + MESO support